Skip to content

Avoid collision with tinyusb hid.h enums #7463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 9, 2022

Conversation

PeterHindes
Copy link
Contributor

@PeterHindes PeterHindes commented Nov 11, 2022

By completing this PR sufficiently, you help us to review this Pull Request quicker and also help improve the quality of Release Notes

Checklist

  1. Please provide specific title of the PR describing the change, including the component name (eg. „Update of Documentation link on Readme.md“)
  2. Please provide related links (eg. Issue which will be closed by this Pull Request)
  3. Please update relevant Documentation if applicable
  4. Please check Contributing guide

This entire section above can be deleted if all items are checked.


Description of Change

Change the names of some defines. I cannot find anywhere in the library where they are used, but I decided to keep them anyway with new names. This pr is in order to fix this issue

Tests scenarios

Please describe on what Hardware and Software combinations you have tested this Pull Request and how.
It compiles, and I have used it on an esp32-s3

@CLAassistant
Copy link

CLAassistant commented Nov 11, 2022

CLA assistant check
All committers have signed the CLA.

@VojtechBartoska VojtechBartoska added this to the 2.0.6 milestone Nov 16, 2022
Copy link
Member

@P-R-O-C-H-Y P-R-O-C-H-Y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with your change. There is a conflict if these headers are used and USB mode is USB-OTG (tinyusb).

// Bluetooth Libraries
#include "BLEHIDDevice.h"

// USB Libraries
#include "USB.h"
#include "USBHIDKeyboard.h"

Thanks for PR @PeterHindes

@SuGlider SuGlider merged commit e355370 into espressif:master Dec 9, 2022
@PeterHindes PeterHindes deleted the patch-2 branch December 9, 2022 03:43
@PeterHindes
Copy link
Contributor Author

Thank you for reviewing and merging.

DamianSuess added a commit to DamianSuess/EspBleLibrary that referenced this pull request Jan 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

Incompatible with usb keyboard demo from esp library
5 participants